d02c87
@@ -387,7 +387,8 @@
public int execute() {
 
       // remove the pwd from conf file so that job tracker doesn't show this logs
       String pwd = job.get(HiveConf.ConfVars.METASTOREPWD.varname);
-      job.set(HiveConf.ConfVars.METASTOREPWD.varname, "HIVE");
+      if (pwd != null)
+        job.set(HiveConf.ConfVars.METASTOREPWD.varname, "HIVE");
       JobClient jc = new JobClient(job);
 
       // make this client wait if job trcker is not behaving well.
@@ -395,7 +396,8 @@
public int execute() {
 
       orig_rj = rj = jc.submitJob(job);
       // replace it back
-      job.set(HiveConf.ConfVars.METASTOREPWD.varname, pwd);
+      if (pwd != null)
+        job.set(HiveConf.ConfVars.METASTOREPWD.varname, pwd);
 
       // add to list of running jobs so in case of abnormal shutdown can kill
       // it.
